From 43ef002e88db1a9c77b049a1275d57cbafded8ec Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Fri, 17 Sep 2021 23:01:57 +0200 Subject: [PATCH] Try to fix salsa-build --- debian/.gitlab-ci.yml | 7 +++++++ debian/rules | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 26871b96e..8aca11a81 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -1,2 +1,9 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + +variables: + SALSABUILD: "YES" + SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "yes" + +reprotest: + allow_failure: true diff --git a/debian/rules b/debian/rules index e28c06c6a..7fbebee27 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4)) export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif +# If SALSABUILD is set we want to drop debug info as well +ifneq ($(SALSABUILD),) + export DEB_CXXFLAGS_MAINT_APPEND += -g0 +endif + %: dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper -- 2.30.2